From f4ebf9476e4d1a1b3489f0fd218f8cb174c9de76 Mon Sep 17 00:00:00 2001 From: rstular Date: Tue, 2 Jun 2020 16:21:34 +0200 Subject: Pipeline bug fix --- .github/workflows/ci-deploy.yml | 10 ++++++---- dist/js/app.js | 2 +- dist/pages/about.html | 2 +- dist/sw.js | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-deploy.yml b/.github/workflows/ci-deploy.yml index b36be84..76bdcfd 100644 --- a/.github/workflows/ci-deploy.yml +++ b/.github/workflows/ci-deploy.yml @@ -22,12 +22,14 @@ jobs: ref: master - name: Replace files run: | - rm -r .[!.]* - mv /tmp/dist/.[!.]* . + rm -r * || true + rm -r .well-known + mv /tmp/dist/.well-known . + mv /tmp/dist/* . - name: Commit files run: | - git config --local user.email "action@github.com" - git config --local user.name "GitHub CI Action" + git config --global user.email "action@github.com" + git config --global user.name "GitHub CI Action" git add -A git commit -m "Mirror change from release" - name: Push changes diff --git a/dist/js/app.js b/dist/js/app.js index 6937790..53115c0 100755 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -3,7 +3,7 @@ const app_version = "1.0.14-beta"; -const previous_commit = "35b595f806f99ca18365d511ab820ab818da348d"; +const previous_commit = "ab8e40cac16a1146fab72dffb8922165b097f730"; if ("serviceWorker" in navigator) { navigator.serviceWorker.register("/sw.js") diff --git a/dist/pages/about.html b/dist/pages/about.html index 6405a1d..748d16c 100755 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -142,7 +142,7 @@

- ^HEAD 35b595f806f99ca18365d511ab820ab818da348d + ^HEAD ab8e40cac16a1146fab72dffb8922165b097f730

diff --git a/dist/sw.js b/dist/sw.js index 9c15e74..c3e0111 100755 --- a/dist/sw.js +++ b/dist/sw.js @@ -3,8 +3,8 @@ // Change version to cause cache refresh -const static_cache_name = "site-static-1.0.14-beta-35b595f"; -// commit before the latest is 35b595f806f99ca18365d511ab820ab818da348d +const static_cache_name = "site-static-1.0.14-beta-ab8e40c"; +// commit before the latest is ab8e40cac16a1146fab72dffb8922165b097f730 // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js // sw.js NE SME BITI CACHAN, ker vsebuje verzijo! -- cgit v1.2.3 From 569d9d8e239e76dcf961855ce6d8ced3b1175d56 Mon Sep 17 00:00:00 2001 From: rstular Date: Tue, 2 Jun 2020 17:05:09 +0200 Subject: Add .well-known to GH pages --- assets/root/_config.yml | 1 + dist/_config.yml | 1 + dist/js/app.js | 2 +- dist/pages/about.html | 2 +- dist/sw.js | 4 ++-- 5 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 assets/root/_config.yml create mode 100644 dist/_config.yml diff --git a/assets/root/_config.yml b/assets/root/_config.yml new file mode 100644 index 0000000..68730c9 --- /dev/null +++ b/assets/root/_config.yml @@ -0,0 +1 @@ +include: [".well-known"] diff --git a/dist/_config.yml b/dist/_config.yml new file mode 100644 index 0000000..68730c9 --- /dev/null +++ b/dist/_config.yml @@ -0,0 +1 @@ +include: [".well-known"] diff --git a/dist/js/app.js b/dist/js/app.js index 53115c0..053135a 100755 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -3,7 +3,7 @@ const app_version = "1.0.14-beta"; -const previous_commit = "ab8e40cac16a1146fab72dffb8922165b097f730"; +const previous_commit = "20505fc48713c600c345814d4a9c2e0747c77152"; if ("serviceWorker" in navigator) { navigator.serviceWorker.register("/sw.js") diff --git a/dist/pages/about.html b/dist/pages/about.html index 748d16c..ebbcfeb 100755 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -142,7 +142,7 @@

- ^HEAD ab8e40cac16a1146fab72dffb8922165b097f730 + ^HEAD 20505fc48713c600c345814d4a9c2e0747c77152

diff --git a/dist/sw.js b/dist/sw.js index c3e0111..4c1211f 100755 --- a/dist/sw.js +++ b/dist/sw.js @@ -3,8 +3,8 @@ // Change version to cause cache refresh -const static_cache_name = "site-static-1.0.14-beta-ab8e40c"; -// commit before the latest is ab8e40cac16a1146fab72dffb8922165b097f730 +const static_cache_name = "site-static-1.0.14-beta-20505fc"; +// commit before the latest is 20505fc48713c600c345814d4a9c2e0747c77152 // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js // sw.js NE SME BITI CACHAN, ker vsebuje verzijo! -- cgit v1.2.3